bitkeeper revision 1.1159.1.264 (417963deTKJzOFoPmj0ZA8TSc7OtRQ)

Fix domain restart.

diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py
index d2cf6a3efa58a3c4f92e15cd1b09f335151ec2c0..36d6a333615f53fbd5365b280d40943a8c3925e1 100644 (file)
--- a/tools/python/xen/xend/XendDomainInfo.py
+++ b/tools/python/xen/xend/XendDomainInfo.py
@@ -444,7 +444,7 @@ class XendDomainInfo:
             if self.memory is None:
                 raise VmError('missing memory size')
             cpu = sxp.child_value(config, 'cpu')
-            if self.dom and cpu is not None:
+            if self.recreate and self.dom and cpu is not None:
                 xc.domain_pincpu(self.dom, int(cpu))
 
             self.init_domain()

diff --git a/tools/python/xen/xend/server/controller.py b/tools/python/xen/xend/server/controller.py
index 3ba9d46f489f0441b3abc2fed5393a3dd9fcf0bf..5b2d7e25a02fc1317854e010ab837c4edb067f6b 100755 (executable)
--- a/tools/python/xen/xend/server/controller.py
+++ b/tools/python/xen/xend/server/controller.py
@@ -68,7 +68,7 @@ class CtrlMsgRcvr:
     @type responders: {int:Responder}
     """
 
-    def __init__(self, remote_port = 0):
+    def __init__(self, remote_port=0):
         self.channelFactory = channel.channelFactory()
         self.majorTypes = {}
         self.dom = None